From 5f5ab67da92dd1ef2868c589c10fedb6b068cc1c Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 17 Jan 2011 21:23:52 -0800
Subject: [PATCH] Minor cleanups for 'bzr status'

* .bzrignore: Add emacs-*/, the output of make-dist, and stamp-h1,
the output of config.guess.
* Makefile.in (top_distclean): Remove stamp-h1 too.
---
 .bzrignore  | 2 ++
 ChangeLog   | 5 +++++
 Makefile.in | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index e39ec6d8c64..b19f60b57b3 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -20,9 +20,11 @@ conftest*
 core
 DOC
 DOC-*
+emacs-*/
 makefile
 Makefile
 Makefile.c
+stamp-h1
 stamp_BLD
 subdirs.el
 TAGS
diff --git a/ChangeLog b/ChangeLog
index b75ef310f78..f365153c63b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-01-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Minor cleanups for 'bzr status'
+	* .bzrignore: Add emacs-*/, the output of make-dist, and stamp-h1,
+	the output of config.guess.
+	* Makefile.in (top_distclean): Remove stamp-h1 too.
+
 	* configure.in (HAVE_ATTRIBUTE_ALIGNED): Arrange for this to be
 	defined if the compiler supports GCC-style __attribute__
 	((__aligned__ ...)).  IBM AIX and Oracle Solaris Studio support
diff --git a/Makefile.in b/Makefile.in
index 13ecb64d684..7edb0843478 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -787,7 +787,7 @@ top_bootclean=\
 ###      distribution.
 top_distclean=\
 	${top_bootclean}; \
-	rm -f config.status Makefile ${SUBDIR_MAKEFILES}
+	rm -f config.status Makefile stamp-h1 ${SUBDIR_MAKEFILES}
 distclean: FRC
 	(cd src;      $(MAKE) $(MFLAGS) distclean)
 	(cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
-- 
2.30.2